use the right type for "subparser_data" and remove the (gpointer*) cast.

2008-01-30  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkbuilderparser.c (parse_custom): use the right type for
	"subparser_data" and remove the (gpointer*) cast. Fixes bogus
	aliasing warning.

	* gtk/updateiconcache.c (add_string): cast const gchar* to
	gpointer when inserting in a GHashTable.

	* tests/testcalendar.c (calendar_detail_cb): remove const from
	return value since it's a newly allocated string.

	(calendar_update_details): free the detail.

svn path=/trunk/; revision=19431

diff --git a/ChangeLog b/ChangeLog
index 9c1a96b7914a4e7266a521ef88928d1e605963ad..04464d574cf01f445aa2a13028fd6d9ce1eb81e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2008-01-30  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkbuilderparser.c (parse_custom): use the right type for
+       "subparser_data" and remove the (gpointer*) cast. Fixes bogus
+       aliasing warning.
+
+       * gtk/updateiconcache.c (add_string): cast const gchar* to
+       gpointer when inserting in a GHashTable.
+
+       * tests/testcalendar.c (calendar_detail_cb): remove const from
+       return value since it's a newly allocated string.
+
+       (calendar_update_details): free the detail.
+
 2008-01-29  Johan Dahlin  <johan@gnome.org>
 
        * demos/gtk-demo/builder.c: (quit_activate), (about_activate),

diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c
index ce4b7dbc912bfcce1f869577b207247c99bc489b..db37467233805d0c8b03bac7dbad4802b91f526a 100644 (file)
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -636,7 +636,7 @@ parse_custom (GMarkupParseContext *context,
 {
   CommonInfo* parent_info;
   GMarkupParser parser;
-  gpointer *subparser_data;
+  gpointer subparser_data;
   GObject *object;
   GObject *child;
 
@@ -671,7 +671,7 @@ parse_custom (GMarkupParseContext *context,
                                       child,
                                       element_name,
                                       &parser,
-                                      (gpointer*)&subparser_data))
+                                      &subparser_data))
     return FALSE;
       
   data->subparser = create_subparser (object, child, element_name,

diff --git a/gtk/updateiconcache.c b/gtk/updateiconcache.c
index 45d0cf00ef23af64da6a9364450287c3c49997d8..14462fb6fd661b716e803cc2b10da7ccba09968b 100644 (file)
--- a/gtk/updateiconcache.c
+++ b/gtk/updateiconcache.c
@@ -744,7 +744,7 @@ find_string (const gchar *n)
 static void
 add_string (const gchar *n, int offset)
 {
-  g_hash_table_insert (string_pool, n, GINT_TO_POINTER (offset));
+  g_hash_table_insert (string_pool, (gpointer) n, GINT_TO_POINTER (offset));
 }
 
 static gboolean

diff --git a/tests/testcalendar.c b/tests/testcalendar.c
index 4e1bb8494770d3c739e87e6a8241b46e1d30ef1f..62423b1c9722a1ab68077fab26dd6b802d51bbdc 100644 (file)
--- a/tests/testcalendar.c
+++ b/tests/testcalendar.c
@@ -105,7 +105,7 @@ static void
 calendar_update_details (CalendarData *data)
 {
   guint year, month, day;
-  const gchar *detail;
+  gchar *detail;
 
   gtk_calendar_get_date (GTK_CALENDAR (data->calendar_widget), &year, &month, &day);
   detail = calendar_get_detail (data, year, month, day);
@@ -113,6 +113,8 @@ calendar_update_details (CalendarData *data)
   g_signal_handler_block (data->details_buffer, data->details_changed);
   gtk_text_buffer_set_text (data->details_buffer, detail ? detail : "", -1);
   g_signal_handler_unblock (data->details_buffer, data->details_changed);
+
+  g_free (detail);
 }
 
 static void
@@ -257,7 +259,7 @@ void calendar_select_font (GtkWidget    *button,
        }
 }
 
-static G_CONST_RETURN gchar*
+static gchar*
 calendar_detail_cb (GtkCalendar *calendar,
                     guint        year,
                     guint        month,